From: Joakim Verona <joakim@verona.se>
Date: Thu, 19 Aug 2010 07:34:21 +0000 (+0200)
Subject: upstream merge
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~3573^2~29
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=96fa1768839e3a9aa5ab5f2b782cea376460df9d;p=emacs.git

upstream merge
---

96fa1768839e3a9aa5ab5f2b782cea376460df9d